early merge of rebalanced salv weapon researching#2077
Merged
deltanedas merged 9 commits intoDeltaV-Station:masterfrom Dec 20, 2024
deltanedas:salv-weapon-ops
Merged
early merge of rebalanced salv weapon researching#2077deltanedas merged 9 commits intoDeltaV-Station:masterfrom deltanedas:salv-weapon-ops
deltanedas merged 9 commits intoDeltaV-Station:masterfrom
deltanedas:salv-weapon-ops
Conversation
github-actions
Bot
added
S: Needs Review
Contributor
|
RSI Diff Bot; head commit dd74a7a merging into b147962 Resources/Textures/Interface/Actions/actions_borg.rsi
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi
|
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
github-actions
Bot
added
size/M
Contributor
|
Is this even relevant anymore |
Contributor
Author
|
yes borgs dont have pkas |
Contributor
|
ETA 24 hours on Direction review |
Lyndomen
approved these changes
Dec 19, 2024
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Mar 28, 2025
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description --- This is a port of the borg chasis selection feature from Wizden. Along with it comes some other things like borg module icons and some changes to how guidebooks work. # TODO <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/864ee581-a36a-478d-aa1e-78e5405297c2 </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Borg Chassis Selection has been ported. Rejoice.
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Mar 28, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
early merge of space-wizards/space-station-14#32398 due to 1 month ops
Changelog
🆑